Reorgazing files to avoid problems with includes
Edited include directives