[Closes #7] Cleaned up directory structure