Folder structure rearrange

fixes #46