Re-organise folder and namespace structure