Removed an unused class and moved a file