Folder structure changed to allow for nice app compilation