refactored package structure;
added correct and improved stage state management