Moved bundle class to seperate source file