reorganized folders. Cleanup of some files.