Remove unnecessary sub-folders and add Makefile