Minor file restructuring