Makefile was modivied (hardcode) and source files were moved to correcpondint dirrectories