Update code base and directory structure