reorganise files - separate ones in use