Refactoring: models module renamed to model, decoders module renamed to decoder