Added descriptions and changed directory structure