Restart the refactoring, build from different structure