Restructure project for tests