Still improving project structure