Removed moved files that I'd not properly updated