moved some files about to have a sensible structure for spring