Rearranged the files for better project handling