Update code structure to facilitate installation