Minor improvements. Restructuring modules
Bumped bundle