Updated Makefile

Just added some cleanup tasks for the build-dir
Renamed files

just to be consistent with module names and what have you.