refactoring and start of markets / districts