Restructure into multi module app