I suggest moving the mainline tracks to either inside or outside the engine house/yard so not to foul a main with movement of locomotives. Or you could put both between the mainlines which will allow taines traveling in either direct to enter and exit the yard.
Jan