Rearrange lots of things into folders; start thinking about credentials storage