Got the app working in the new file strucure