refactored the compnay to user bundle part2