Tweaks and added the rest of the app folders