everything warm-up related moved to directory warm_up
merge conflicts fixed