Move file back to root.
Fix path.
Updated and cleaned up.