Will use Config and Messages.java layout after all

Will make everything a lot easier - this still will fail when building