Use this new thing called a directory structure to organize the files a little better.
Remove unused files from the lib directory.
Group source files into categories.
Update references to files that changed names.  Add the necessary include paths to the compiler args.