Re organized the location of some of the classes