Add better package structure
Update Osmosis from version 0.40.1 to 0.43.1 and clean up libraries