Working on simplifying project structure.