renamed some files due to the conventions