Made the project structure more conventional and added first test