Finalised directory restructure