Modularization, updated schema and views