Fixed: Build files.
Massive code cleanup.