Restructuring, adding bootstrap