Deleted deprecated files, restructuring format