restructure Status module
restructured