Moving files into correct directory structure, fixes #1