Updating make instructions to match new finename scheme
Updating clean target for new directory structure