Added to the keystone file for automated setup. Moved some files around to get ride of customer and test files.