Removed old class
Moved files