Rearranging even a bit more
Cleanup
Added libs and tarbvals for 0.4.0