The accommodation and the shop could easily both be made into self contained units within the same building. This would give the shop the ability to be turned into a lockup unit.

The common wall between the shop and the 5th bedroom/office could be removed, meaning that the shop could be extended across the front of the building.