Removed some unneccessary classes, changed  structure