Restructured working directory, refactored some code
Merged with latest commit