Removed old directories, fixed up js ordering in bootstrap