moving things around to meet new project structure