Consolidate all development code into the 'x' directory