Removing deprecated files. Moving stuff around