Finish structuring the App