Rearranged files for easy copy/paste for developers.