Moved classes in src/