Restructuring project to assimilate travis