Small organization update
Updated build and initialization process