Restructured, organized the files, saved some test sites