Refactored Makefiles to adjust to new folder structure.
Added Makefile.common
Fixed #includes and wrong folders in Makefile.common