move libraries to include folder, add buttons