Updated reinit implementation
Updated build files