reorganized folder structure and js files
minor text changes