rearranged project

removed some folders to be less cluttered