restructuring files and directory