Rework of files

Reworked files & Updated Bootstrap