Updated project structure, unit tests now working