major reforge to mudular structure