Move to pure Java Config - version 1.0