Changes entry point of app so that it works now. Also reorganizes group structure (adds App group)