Reorganizing to lower the number of layers
Adding execline also