Move ct -> test
Started on ct structure improvements
More standardised CT structure