moved everything into shared project and renamed files
null parameters