v0.6.1alpha1

Fixing file structure