Changed type names to fit the "new" project name
Introduced modules, cleaned up imports, moved functions around.
Removed an old file that didn't get removed during the file split.
Fixed a faulty pattern that would cause lone values in parentheses to throw exceptions.