Updating visuals
Reorganise files