PEP8 and rearange execution with step-like behaviour
Rearange filess.