Central planning strategy remastered
Organizing imports, code refactoring
Merge remote-tracking branch 'internetz/master'