Removed some stuff to put into src, and rearranged everything to be either generic or OS specific.