Update further application structure. Continue building out components for test suites etc