Merge "NeutronVPN: Code reorganization and copyright changes"