Refactored project structure, closes #35