Fixed grid movement; separated item classes into new classes