Update regexp
Reorganization and split into views