Refactored naming convention and added the tests to a separate directory in an attempt to clean up.

Refactored naming convention and added the tests to a separate directory in an attempt to clean up.