removing tests for now; out of scope
renamed files
better naming conventions