Update folder structure, fixes #2