simplifying directory layout; got the run target working