Added application controller and moved tests to correct package