Renamed files for sensibility
Spec fixups
Makefile fixups