Change folder organization. (fixes #4)