Organize app and its resources better