Restructure directories
Scratch area for autocomplete work
Put in commented autocompletes