remove git modules
move App to top level
re-added modules