Removed email stuff, changed directory stucture