Moved some classes around, deteled others and made some improvements