move components into folders as getting out of hand, update bootstrap