Small changes in project structure