Re-arranging some things for the greater organization of it all and to set the source up for autoconf/make/etc.