removed 'z' module + general organization