Move misplaced files and fix prototypes.