Minor improvements in project structure