Modified makefile to contain clean.
New naming convention for files.