changed directory structure, added views