Housekeeping:
  - Moved files to improve clarity.
  - Removed unused code.