Remove package objects from models and controllers

These files are used for documentation only. Useful, but prohibit me
from adding package objects with real logic in my project.