Separated StateStructure and StateStructureFiller, added comments