restructuring folder hierarchy