renamed some files and added basic targets into Makefile