Reorganize code and add Bootstrap