Folder directorys re-arranged to assist with deployment