committing net code and restructuring packages