Created structure for performant picking (not finished yet)
corrected movement