Removed models from constants, created new module