Polished up imports and java config class names