moved some files back to the bundle due to too much inheritance