Removed extra files - moved a couple of files