Moved files for case fix
Fixed cases