Added scripts, reorganized subdirs