Reorganized my setup [after/before]