First commit for the new, more organized source.