Making a better project structure