Added module struture