US1

Fixed issues arising from moving model and test code to a new source
folder