Moved files into new directory
Include elevation service