Init standard bundle structure
Code fixes