making it bootstrap friendly
renaming files and cleaning up