Better dir structure for angular, fix js spec