moved changes to new structure