A few directory rearrangements, and implementation of basic input handling.