Added bootstrapping and cleaned file structure.