Worked further on project structure.