Restructure project to accomodate bigger tests