Merge pull request #29 from dmilisav/master

Small changes to main.py and UnitTests to adhere to new file structure.