Some repository rearrangement preapring project extension.
Removing files moved to subdirectories and adding an update in makefile.