Changed the package hierarcy and started to work with config files