Price Adjust 4 first round of changes

Also renamed all of the directories, so Git history is screwed