simplified master API structure
refactorized some models code for more genericity
cleaned API views
using new API generic views in master