added angular, changed directory structure