Reorg tree structure and simplofy Vagrant file for external Ansible deployment