Rearranged folders. Added new project structure.