Refactoring project structure before it's too late. Hopefully this
doesn't break everything!