Enable test discovery
Better project organization to allow for test discovery
Final adjustments of the new organization