Slight modifications to project structure