Moved objects without main and refactored paths