Upgrading to 0.6.0 and some restructoring