Reorg of src files