streamline project directory structure #96

Directory structure changes as discussed in #96