Tidying up the build scripts and directories

- In an attempt to make things easier to maintain longer term, doing some tidy up work within the build directories and the build scripts.
- Added icon for Chocolatey Package