Models and Environment configurations moved to separate files