source folder rearranged
Cleaning up