Add bootstrap, reorganize