Moved code into a new directory EvMS