Redid the layout of the project - separated main and tests