Controll-2: Separate core functionality and war into two modules