cleaning the code (merged fixed and not fixed trainers, models and layers