reorganized structure, added seperate controllers for seperate shells