Some cleanup. Moved Configuration.java to utils