Move to the right place
Delete spring xml based config for now