fixed preview and reorganized files