moved and removed some files/code