restructured the main and app modules a bit