Moved classes to the correct directory