Replaced the cryptic $: with the more logical
Renamed some files to align them with conceptual goals