Updated directory structure and bootstrap file