Consolidating my working files