Reorganized files and completed getting poketypes.