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