Initial clean-up

Just deletion of files and some renamed. No modifications yet.