added more files, more structural updates