File organization cleanup.
Adding, renaming, and modifying files to work for Fuerte.