Got the self contained model to work
Rearranging the files