updates to use gen and source folders complete and tested