re-organized and cleaned up directory