Removed some files not to be included and added some