Restructure into root
Tests for accordion controller