Cleaned up question adding functionality.
Cleaned up directories.