Fixed a bug and cleaned up project structure.
Merge pull request #4 from benbueltmann/feature/bandedo/bug-fix

Fixed a bug and cleaned up project structure.