Changed Folder structure and using bootstrap