upgraded bootstrap
reorganized structure
progress on client