Switched past event order, removed uncessary folders