refactor module structure
restructuring module