Adjust directory structure; tweak login; add AppContext