modify models according to @mmaker
adapt admin to new models
adapt fixtures to new models
Adding new models