Final directory restructure