Restructures app and adds a bunch of things