Update makefile and separate source
Delete bad files