Cleaned up code, made some more readable
Moved Predefined types from Type to Types