restructuring files and navigation