Updated directory structure and build