Moved state instantiating into .cpps