Removed .h, and merged its contents into .c