Re-work Make.sh after pickett filename reorg.
Merge pull request #115 from rakitzis/make

Re-work Make.sh after pickett filename reorg.