update file structure and bootstrap script