Removed various files and renamed others