initial commit. some module house keeping