Began modularize db