Fix relative path
Change to use separate bundle folder
Automatically create sample in current working directory
Fixing tabs