Project restructure and rewrite in Negroni