Updated paths, refactoring into single installer creation script.
Updates and fixes