Added bootstrap package
Worse is better. Re-arranged file structure.