Cleaned up project

Got rid of unneccessary classes and fixed res unsync.