directory restructure and manifest cleanup