ModuleBase removed.
Sample projects ajusted.
Code formated.