Added Content schema, modularize controllers