Moved to clean up directories
Updated and moved
Added diagnostics functionality