Refactored some of the structure

Refactored naming convention and added the tests to a separate directory in an attempt to clean up. Following PEP08 guidelines for filename convention. Added a separate folder for testing.