slimmed down duplicate folders and files, changed admin site