Cleaned for new project structure