Cleaning up unused folders, consolidating install directory