Moving other configurations into model.configuration folder, fixing builds