Simplified the vagrant environment and directory names.