Removed makefiles due to changes is makefile naming logic