Removed extra classes that where left over do to folder restructuring the project