restructured the files in project folder