Organized code some more for readability.
Restructuring

Restructured the project a little.