renamed a few files and classes

Fixed a few issues with semantics