Removed unneeded files
Reworked type system