Initial work on project structure