Fix Naming and Imports

Fix import statements for submodules and rename certain files and
classes for cleaner usage.