Revert "Changed model and admin accordingly", this should be on a separate branch to be accepted.

This reverts commit 22230350274935626a8cd85b81909e3d0ddd9665.