cleanup gulp source dirs
make baseModel better