Get accordion working and move serv/js files, rename cntrl dir to cont