161 files changed, 42 insertions, 728 deletions

diff --git a/litmus01.pdf b/litmus01.pdf
deleted file mode 100644
index 4fba2fa..0000000
--- a/litmus01.pdf
+++ /dev/null
diff --git a/litmus02.pdf b/litmus02.pdf
deleted file mode 100644
index bcfdcab..0000000
--- a/litmus02.pdf
+++ /dev/null
diff --git a/mac b/mac
deleted file mode 160000
-Subproject cd6e43f37856f7fe6b60e0e2ae45f864a4bd6d6
diff --git a/reader/__init__.py b/reader/__init__.py
deleted file mode 100644
index afbfe44..0000000
--- a/reader/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import trace_reader
-import gedf_test
-import sanitizer
-import stats
diff --git a/reader/gedf_test.py b/reader/gedf_test.py
deleted file mode 100644
index e31fb19..0000000
--- a/reader/gedf_test.py
+++ /dev/null
@@ -1,163 +0,0 @@
-###############################################################################
-# Description
-###############################################################################
-
-# G-EDF Test
-
-###############################################################################
-# Imports
-###############################################################################
-
-import copy
-
-
-##############################################################################
-# Public Functions
-##############################################################################
-
-def gedf_test(stream):
-
-    # Two lists to model the system: tasks occupying a CPU and tasks eligible
-    # to do so. Also, m = the number of CPUs.
-    eligible = []
-    on_cpu = []
-    m = None
-
-    # Time of the last record we saw. Only run the G-EDF test when the time
-    # is updated.
-    last_time = None
-
-    for record in stream:
-        if record.record_type != "event":
-            if record.record_type == "meta" and record.type_name == "num_cpus":
-                m = record.num_cpus
-            continue
-
-        # Check for inversion starts and ends and yield them.
-        # Only to the check when time has moved forward.
-        # (It is common to have records with simultaneous timestamps.)
-        if last_time is not None and last_time != record.when:
-            errors = _gedf_check(eligible,on_cpu,record.when,m)
-            for error in errors:
-                yield error
-
-        # Add a newly-released Job to the eligible queue
-        if record.type_name == 'release':
-            eligible.append(Job(record))
-
-        # Move a Job from the eligible queue to on_cpu
-        elif record.type_name == 'switch_to':
-            pos = _find_job(record,eligible)
-            job = eligible[pos]
-            del eligible[pos]
-            on_cpu.append(job)
-
-        # Mark a Job as completed.
-        # The only time a Job completes when it is not on a
-        # CPU is when it is the last job of the task.
-        elif record.type_name == 'completion':
-            pos = _find_job(record,on_cpu)
-            if pos is not None:
-                on_cpu[pos].is_complete = True
-            else:
-                pos = _find_job(record,eligible)
-                del eligible[pos]
-
-        # A job is switched away from a CPU. If it has
-        # been marked as complete, remove it from the model.
-        elif record.type_name == 'switch_away':
-            pos = _find_job(record,on_cpu)
-            job = on_cpu[pos]
-            del on_cpu[pos]
-            if job.is_complete == False:
-                eligible.append(job)
-
-        last_time = record.when
-        yield record
-
-###############################################################################
-# Private Functions
-###############################################################################
-
-# Internal representation of a Job
-class Job(object):
-    def __init__(self, record):
-        self.pid = record.pid
-        self.job = record.job
-        self.deadline = record.deadline
-        self.is_complete = False
-        self.inversion_start = None
-        self.inversion_end = None
-    def __str__(self):
-        return "(%d.%d:%d)" % (self.pid,self.job,self.deadline)
-
-# G-EDF errors: the start or end of an inversion
-class Error(object):
-    def __init__(self, job, eligible, on_cpu):
-        self.job = copy.copy(job)
-        self.eligible = copy.copy(eligible)
-        self.on_cpu = copy.copy(on_cpu)
-        self.record_type = 'error'
-        if job.inversion_end is None:
-            self.type_name = 'inversion_start'
-        else:
-            self.type_name = 'inversion_end'
-
-# Returns the position of a Job in a list, or None
-def _find_job(record,list):
-    for i in range(0,len(list)):
-        if list[i].pid == record.pid and list[i].job == record.job:
-            return i
-    return None
-
-# Return records for any inversion_starts and inversion_ends
-def _gedf_check(eligible,on_cpu,when,m):
-
-    # List of error records to be returned
-    errors = []
-
-    # List of all jobs that are not complete
-    all = []
-    for x in on_cpu:
-        if x.is_complete is not True:
-            all.append(x)
-    all += eligible
-
-    # Sort by on_cpu and then by deadline. sort() is guaranteed to be stable.
-    # Thus, this gives us jobs ordered by deadline with preference to those
-    # actually running.
-    all.sort(key=lambda x: 0 if (x in on_cpu) else 1)
-    all.sort(key=lambda x: x.deadline)
-
-    # Check those that actually should be running
-    for x in range(0,min(m,len(all))):
-        job = all[x]
-
-        # It's not running and an inversion_start has not been recorded
-        if job not in on_cpu and job.inversion_start is None:
-            job.inversion_start = when
-            errors.append(Error(job, eligible, on_cpu))
-
-        # It is running and an inversion_start exists (i.e. it it still
-        # marked as being inverted)
-        elif job in on_cpu and job.inversion_start is not None:
-            job.inversion_end = when
-            errors.append(Error(job, eligible, on_cpu))
-            job.inversion_start = None
-            job.inversion_end = None
-
-    # Check those that actually should not be running
-    for x in range(m,len(all)):
-        job = all[x]
-
-        # It actually is running. We don't care.
-
-        # It isn't running, but an inversion_start exists (i.e. it is still
-        # marked as being inverted)
-        if job not in on_cpu and job.inversion_start is not None:
-            job.inversion_end = when
-            errors.append(Error(job, eligible, on_cpu))
-            job.inversion_start = None
-            job.inversion_end = None
-
-    return errors
diff --git a/reader/naive_trace_reader.py b/reader/naive_trace_reader.py
deleted file mode 100644
index 0f117b8..0000000
--- a/reader/naive_trace_reader.py
+++ /dev/null
@@ -1,165 +0,0 @@
-###############################################################################
-# Description
-###############################################################################
-
-# trace_reader(files) returns an iterator which produces records
-# OUT OF ORDER from the files given. (the param is a list of files.)
-#
-# The non-naive trace_reader has a lot of complex logic which attempts to
-# produce records in order (even though they are being pulled from multiple
-# files which themselves are only approximately ordered). This trace_reader
-# attempts to be as simple as possible and is used in the unit tests to
-# make sure the total number of records read by the normal trace_reader is
-# the same as the number of records read by this one.
-
-###############################################################################
-# Imports
-###############################################################################
-
-import struct
-
-
-###############################################################################
-# Public functions
-###############################################################################
-
-# Generator function returning an iterable over records in a trace file.
-def trace_reader(files):
-    for file in files:
-        f = open(file,'rb')
-        while True:
-            data = f.read(RECORD_HEAD_SIZE)
-            try:
-                type_num = struct.unpack_from('b',data)[0]
-            except struct.error: 
-                break #We read to the end of the file
-            type = _get_type(type_num)
-            try:
-                values = struct.unpack_from(StHeader.format + 
-                    type.format,data)
-                record_dict = dict(zip(type.keys,values))
-            except struct.error:
-                f.close()
-                print "Invalid record detected, stopping."
-                exit()
-                
-            # Convert the record_dict into an object
-            record = _dict2obj(record_dict)
-
-            # Give it a type name (easier to work with than type number)
-            record.type_name = _get_type_name(type_num)
-
-            # All records should have a 'record type' field.
-            # e.g. these are 'event's as opposed to 'error's
-            record.record_type = "event"
-
-            # If there is no timestamp, set the time to 0
-            if 'when' not in record.__dict__.keys():
-                record.when = 0
-
-            yield record
-
-###############################################################################
-# Private functions
-###############################################################################
-
-# Convert a dict into an object
-def _dict2obj(d):
-    class Obj: pass
-    o = Obj()
-    for key in d.keys():
-        o.__dict__[key] = d[key]
-    return o 
-
-###############################################################################
-# Trace record data types and accessor functions
-###############################################################################
-
-# Each class below represents a type of event record. The format attribute
-# specifies how to decode the binary record and the keys attribute
-# specifies how to name the pieces of information decoded. Note that all
-# event records have a common initial 24 bytes, represented by the StHeader
-# class.
-
-RECORD_HEAD_SIZE = 24
-
-class StHeader(object):
-    format =  '<bbhi'
-    formatStr = struct.Struct(format)
-    keys = ['type','cpu','pid','job']
-    message = 'The header.'
-
-class StNameData(object):
-    format =  '16s'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['name']
-    message = 'The name of the executable of this process.'
-
-class StParamData(object):  
-    format =  'IIIc'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['wcet','period','phase','partition']
-    message = 'Regular parameters.'
-
-class StReleaseData(object):
-    format =  'QQ'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when','deadline']
-    message = 'A job was/is going to be released.'
-
-#Not yet used by Sched Trace 
-class StAssignedData(object):
-    format =  'Qc'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when','target']
-    message = 'A job was assigned to a CPU.'
-
-class StSwitchToData(object):
-    format =  'QI'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when','exec_time']
-    message = 'A process was switched to on a given CPU.'
-
-class StSwitchAwayData(object):
-    format =  'QI'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when','exec_time']
-    message = 'A process was switched away on a given CPU.'
-
-class StCompletionData(object):
-    format =  'Q3xcc'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when','forced?','flags']
-    message = 'A job completed.'
-
-class StBlockData(object):
-    format =  'Q'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when']
-    message = 'A task blocks.'
-
-class StResumeData(object):
-    format =  'Q'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when']
-    message = 'A task resumes.'
-
-class StSysReleaseData(object):
-    format =  'QQ'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when','release']
-    message = 'All tasks have checked in, task system released by user'
-
-# Return the binary data type, given the type_num
-def _get_type(type_num):
-    types = [None,StNameData,StParamData,StReleaseData,StAssignedData,
-             StSwitchToData,StSwitchAwayData,StCompletionData,StBlockData,
-             StResumeData,StSysReleaseData]
-    return types[type_num]
-
-# Return the type name, given the type_num (this is simply a convenience to
-#     programmers of other modules)
-def _get_type_name(type_num):
-    type_names = [None,"name","params","release","assign","switch_to",
-        "switch_away","completion","block","resume","sys_release"]
-    return type_names[type_num]
diff --git a/reader/runtests.py b/reader/runtests.py
deleted file mode 100755
index 88dddf4..0000000
--- a/reader/runtests.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-
-###############################################################################
-# Description
-###############################################################################
-
-# Unit Tests
-
-
-###############################################################################
-# Imports
-###############################################################################
-
-import trace_reader
-import naive_trace_reader
-import os
-
-###############################################################################
-# Trace files
-###############################################################################
-
-files = [
-'./sample_traces/st-g6-0.bin',
-'./sample_traces/st-g6-1.bin',
-'./sample_traces/st-g6-2.bin',
-'./sample_traces/st-g6-3.bin',
-]
-
-###############################################################################
-# Tests
-###############################################################################
-
-# Does our fancy trace reader get the same number of files as our naive one?
-# (See naive_trace_reader.py for further explanation)
-def test1():
-    stream = trace_reader.trace_reader(files)
-    num_records = len(list(stream))
-    stream = naive_trace_reader.trace_reader(files)
-    naive_num_records = len(list(stream))
-
-    # We need a +1 here because the fancy reader produces a 'meta' record
-    # indicating the number of CPUs
-    if num_records != naive_num_records + 1:
-        return "[FAIL]"
-    return "[SUCCESS]"
-
-print "Test 1: %s" % (test1())
diff --git a/reader/sample_script.py b/reader/sample_script.py
deleted file mode 100755
index f7e9297..0000000
--- a/reader/sample_script.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-
-# This is a sample script for using the tool. I would recommend copying
-# this and modifying it to suit your needs for a particular test. Make
-# sure you redirect the output to a file (e.g. ./sample_script.py > output).
-
-# Import the modules we need. You should not need to know about
-# their internals.
-import trace_reader
-import sanitizer
-import gedf_test
-import stats
-import stdout_printer
-
-# Specify your trace files
-g6 = [
-'../sample_traces/st-g6-0.bin',
-'../sample_traces/st-g6-1.bin',
-'../sample_traces/st-g6-2.bin',
-'../sample_traces/st-g6-3.bin',
-]
-
-# Here is an example of a custom filter function.
-# It will remove from the error stream all inversion_end records indicating
-# an inversion of less than 4000000 time units. Thus, you can grep through
-# the output looking 'Inversion end' and find only errors for particularly
-# long inversions. This is commented out in the pipeline (below) since you
-# probably don't want it in general.
-def my_filter(record):
-    if record.record_type == 'error' and record.type_name == 'inversion_end':
-        if record.job.inversion_end - record.job.inversion_start < 4000000:
-            return False
-    return True
-
-# Pipeline
-stream = trace_reader.trace_reader(g6)   # Read events from traces
-stream = sanitizer.sanitizer(stream)     # Remove garbage events
-stream = gedf_test.gedf_test(stream)     # Produce G-EDF error records
-stream = stats.stats(stream)             # Produce a statistics record
-#stream = filter(my_filter, stream)      # Filter some records before printing
-stdout_printer.stdout_printer(stream)    # Print records to stdout
diff --git a/reader/sample_script.py~ b/reader/sample_script.py~
deleted file mode 100644
index c3b7843..0000000
--- a/reader/sample_script.py~
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-
-# This is a sample script for using the tool. I would recommend copying
-# this and modifying it to suit your needs for a particular test. Make
-# sure you redirect the output to a file (e.g. ./sample_script.py > output).
-
-# Import the modules we need. You should not need to know about
-# their internals.
-import trace_reader
-import sanitizer
-import gedf_test
-import stats
-import stdout_printer
-
-# Specify your trace files
-g6 = [
-'./sample_traces/st-g6-0.bin',
-'./sample_traces/st-g6-1.bin',
-'./sample_traces/st-g6-2.bin',
-'./sample_traces/st-g6-3.bin',
-]
-
-# Here is an example of a custom filter function.
-# It will remove from the error stream all inversion_end records indicating
-# an inversion of less than 4000000 time units. Thus, you can grep through
-# the output looking 'Inversion end' and find only errors for particularly
-# long inversions. This is commented out in the pipeline (below) since you
-# probably don't want it in general.
-def my_filter(record):
-    if record.record_type == 'error' and record.type_name == 'inversion_end':
-        if record.job.inversion_end - record.job.inversion_start < 4000000:
-            return False
-    return True
-
-# Pipeline
-stream = trace_reader.trace_reader(g6)   # Read events from traces
-stream = sanitizer.sanitizer(stream)     # Remove garbage events
-stream = gedf_test.gedf_test(stream)     # Produce G-EDF error records
-stream = stats.stats(stream)             # Produce a statistics record
-#stream = filter(my_filter, stream)      # Filter some records before printing
-stdout_printer.stdout_printer(stream)    # Print records to stdout
diff --git a/reader/sanitizer.py b/reader/sanitizer.py
deleted file mode 100644
index 79315cc..0000000
--- a/reader/sanitizer.py
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# Description
-###############################################################################
-
-# Sanitize input. (There are a number of goofy issues with the sched_trace
-# output.)
-
-###############################################################################
-# Public functions
-###############################################################################
-
-def sanitizer(stream):
-
-    job_2s_released = [] # list of tasks which have released their job 2s
-    jobs_switched_to = []
-
-    for record in stream:
-
-        # Ignore records which are not events (e.g. the num_cpus record)
-        if record.record_type != 'event':
-            yield record
-            continue
-
-        # All records with job < 2 are garbage
-        if record.job < 2:
-            continue
-
-        # Some records with job == 2 are garbage
-        if record.job==2:
-
-            # There is a duplicate release of every job 2
-            # This will throw away the second one
-            if record.type_name == 'release':
-                if record.pid in job_2s_released:
-                    continue
-                else:
-                    job_2s_released.append(record.pid)
-
-            # Job 2 has a resume that is garbage
-            if record.type_name == 'resume':
-                continue
-
-        # By default, the switch_away for a job (after it has completed)
-        # is maked as being for job+1, which has never been switched to.
-        # We can correct this if we note which jobs really
-        # have been switched to.
-        if record.type_name == 'switch_to':
-            jobs_switched_to.append((record.pid,record.job))
-        if record.type_name == 'switch_away':
-            if (record.pid,record.job) not in jobs_switched_to:
-                record.job -= 1
-        
-        yield record
diff --git a/reader/stats.py b/reader/stats.py
deleted file mode 100644
index 34a842f..0000000
--- a/reader/stats.py
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# Description
-###############################################################################
-# Compute and produce statistics
-
-
-###############################################################################
-# Public Functions
-###############################################################################
-
-def stats(stream):
-    min_inversion = -1
-    max_inversion = -1
-    sum_inversions = 0
-    num_inversions = 0
-    for record in stream:
-        if record.type_name == 'inversion_end':
-            length = record.job.inversion_end - record.job.inversion_start
-            if length > 0:
-                num_inversions += 1
-                if length > max_inversion:
-                    max_inversion = length
-                if length < min_inversion or min_inversion == -1:
-                    min_inversion = length
-                sum_inversions += length
-        yield record
-    if num_inversions > 0:
-        avg_inversion = int(sum_inversions / num_inversions)
-    else:
-        avg_inversion = 0
-    class Obj(object): pass
-    rec = Obj()
-    rec.record_type = "meta"
-    rec.type_name = "stats"
-    rec.num_inversions = num_inversions 
-    rec.min_inversion = min_inversion
-    rec.max_inversion = max_inversion
-    rec.avg_inversion = avg_inversion
-    yield rec
diff --git a/reader/stdout_printer.py b/reader/stdout_printer.py
deleted file mode 100644
index f8d9a84..0000000
--- a/reader/stdout_printer.py
+++ /dev/null
@@ -1,69 +0,0 @@
-###############################################################################
-# Description
-###############################################################################
-
-# Prints records to standard out
-
-###############################################################################
-# Public functions
-###############################################################################
-
-def stdout_printer(stream):
-    for record in stream:
-        if record.record_type == "event":
-            _print_event(record)
-        elif record.record_type == "meta" and record.type_name == "stats":
-            _print_stats(record)
-        elif record.record_type == "error" and record.type_name == 'inversion_start':
-            _print_inversion_start(record)
-        elif record.record_type == "error" and record.type_name == 'inversion_end':
-            _print_inversion_end(record)
-        else:
-            continue
-        print ""
-
-###############################################################################
-# Private functions
-###############################################################################
-
-def _print_event(record):
-    print "Job: %d.%d" % (record.pid,record.job)
-    print "Type: %s" % (record.type_name)
-    print "Time: %d" % (record.when)
-
-def _print_inversion_start(record):
-    print "Type: %s" % ("Inversion start")
-    print "Time: %d" % (record.job.inversion_start)
-    print "Job: %d.%d" % (record.job.pid,record.job.job)
-    print "Deadline: %d" % (record.job.deadline)
-    print "Eligible: ",
-    for job in record.eligible:
-        print str(job) + " ",
-    print
-    print "On CPU: ",
-    for job in record.on_cpu:
-        print str(job) + " ",
-    print #newline
-
-def _print_inversion_end(record):
-    print "Type: %s" % ("Inversion end")
-    print "Time: %d" % (record.job.inversion_end)
-    print "Duration: %d" % (
-        record.job.inversion_end - record.job.inversion_start)
-    print "Job: %d.%d" % (record.job.pid,record.job.job)
-    print "Deadline: %d" % (record.job.deadline)
-    print "Eligible: ",
-    for job in record.eligible:
-        print str(job) + " ",
-    print
-    print "On CPU: ",
-    for job in record.on_cpu:
-        print str(job) + " ",
-    print #newline
-
-def _print_stats(record):
-    print "Inversion statistics" 
-    print "Num inversions: %d" % (record.num_inversions)
-    print "Min inversion: %d" % (record.min_inversion)
-    print "Max inversion: %d" % (record.max_inversion)
-    print "Avg inversion: %d" % (record.avg_inversion)
diff --git a/reader/test.py b/reader/test.py
deleted file mode 100755
index b260314..0000000
--- a/reader/test.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python
-
-import cairo
-
-if __name__ == '__main__':
-    surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 500, 500)
-    ctx = cairo.Context(surface)
-    ctx.move_to(10, 10)
-    ctx.line_to(-100, 10)
-    ctx.set_line_width(2)
-    
-    ctx.move_to(10, 10)
-    ctx.line_to(20, 10)
-    ctx.stroke()
-    surface.write_to_png('test.png')
diff --git a/sample_script.py b/sample_script.py
index c3b7843..435cde0 100755
--- a/sample_script.py
+++ b/sample_script.py
@@ -1,9 +1,16 @@
 #!/usr/bin/python
 
+################################################################################
+# Description
+################################################################################
 # This is a sample script for using the tool. I would recommend copying
 # this and modifying it to suit your needs for a particular test. Make
 # sure you redirect the output to a file (e.g. ./sample_script.py > output).
 
+################################################################################
+# Setup
+################################################################################
+
 # Import the modules we need. You should not need to know about
 # their internals.
 import trace_reader
@@ -11,6 +18,7 @@ import sanitizer
 import gedf_test
 import stats
 import stdout_printer
+import visualizer
 
 # Specify your trace files
 g6 = [
@@ -20,22 +28,37 @@ g6 = [
 './sample_traces/st-g6-3.bin',
 ]
 
-# Here is an example of a custom filter function.
-# It will remove from the error stream all inversion_end records indicating
-# an inversion of less than 4000000 time units. Thus, you can grep through
-# the output looking 'Inversion end' and find only errors for particularly
-# long inversions. This is commented out in the pipeline (below) since you
-# probably don't want it in general.
+################################################################################
+# Pipeline
+################################################################################
+
+# Read events from traces
+stream = trace_reader.trace_reader(g6)
+
+# Filter out garbage events
+stream = sanitizer.sanitizer(stream)
+
+# Produce G-EDF error records
+stream = gedf_test.gedf_test(stream)
+
+# Produce a statistics record
+stream = stats.stats(stream)
+
+# Filter some records out
+# NOTE: Currently, this will break the Visualizer if enabled
 def my_filter(record):
     if record.record_type == 'error' and record.type_name == 'inversion_end':
         if record.job.inversion_end - record.job.inversion_start < 4000000:
             return False
     return True
+#stream = filter(my_filter, stream)
 
-# Pipeline
-stream = trace_reader.trace_reader(g6)   # Read events from traces
-stream = sanitizer.sanitizer(stream)     # Remove garbage events
-stream = gedf_test.gedf_test(stream)     # Produce G-EDF error records
-stream = stats.stats(stream)             # Produce a statistics record
-#stream = filter(my_filter, stream)      # Filter some records before printing
-stdout_printer.stdout_printer(stream)    # Print records to stdout
+# Split the stream in two, so we can use both output mechanisms
+import itertools
+stream1, stream2 = itertools.tee(stream,2)
+
+# Print the records to stdout
+stdout_printer.stdout_printer(stream1)
+
+# Visualize the records
+visualizer.visualizer(stream2)
diff --git a/traces/g1.pdf b/traces/g1.pdf
deleted file mode 100644
index c9ee920..0000000
--- a/traces/g1.pdf
+++ /dev/null
diff --git a/traces/g2.pdf b/traces/g2.pdf
deleted file mode 100644
index a807c9f..0000000
--- a/traces/g2.pdf
+++ /dev/null
diff --git a/traces/g3.pdf b/traces/g3.pdf
deleted file mode 100644
index 3bb4e78..0000000
--- a/traces/g3.pdf
+++ /dev/null
diff --git a/traces/g4.pdf b/traces/g4.pdf
deleted file mode 100644
index 867f413..0000000
--- a/traces/g4.pdf
+++ /dev/null
diff --git a/traces/g5.pdf b/traces/g5.pdf
deleted file mode 100644
index c12ebde..0000000
--- a/traces/g5.pdf
+++ /dev/null
diff --git a/traces/g6.pdf b/traces/g6.pdf
deleted file mode 100644
index 3c8d667..0000000
--- a/traces/g6.pdf
+++ /dev/null
diff --git a/traces/heavy.ts b/traces/heavy.ts
deleted file mode 100644
index 8df12a0..0000000
--- a/traces/heavy.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-#EXE=200
-#PER=300
-EXE=17
-PER=30
-
-for i in `seq 1 6`
-do
-        rt_launch -w $EXE $PER run
-done
diff --git a/traces/heavy2.ts b/traces/heavy2.ts
deleted file mode 100644
index 23d5e0f..0000000
--- a/traces/heavy2.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE=18
-PER=30
-
-for i in `seq 1 6`
-do
-        rtspin -w $EXE $PER 3 &
-done
diff --git a/traces/light.ts b/traces/light.ts
deleted file mode 100644
index db961b2..0000000
--- a/traces/light.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-#EXE=200
-#PER=300
-EXE=2
-PER=11
-
-for i in `seq 1 18`
-do
-        rt_launch -w $EXE $PER run
-done
diff --git a/traces/medium.ts b/traces/medium.ts
deleted file mode 100644
index a800180..0000000
--- a/traces/medium.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE=2
-PER=12
-
-for i in `seq 1 6`
-do
-        rt_launch -w $EXE $PER run
-done
diff --git a/traces/mixed.ts b/traces/mixed.ts
deleted file mode 100644
index 1258d1a..0000000
--- a/traces/mixed.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-#EXE=200
-#PER=300
-EXE=2
-PER=11
-
-for i in `seq 10 20`
-do
-        rtspin -w $EXE $i 2 &
-done
-
-EXE=17
-for i in 31 32 33
-do
-        rtspin -w $EXE $i 2 &
-done
diff --git a/traces/st-g1-0.bin b/traces/st-g1-0.bin
deleted file mode 100644
index a88bd3e..0000000
--- a/traces/st-g1-0.bin
+++ /dev/null
diff --git a/traces/st-g1-1.bin b/traces/st-g1-1.bin
deleted file mode 100644
index 8439bb8..0000000
--- a/traces/st-g1-1.bin
+++ /dev/null
diff --git a/traces/st-g1-2.bin b/traces/st-g1-2.bin
deleted file mode 100644
index 371bf49..0000000
--- a/traces/st-g1-2.bin
+++ /dev/null
diff --git a/traces/st-g1-3.bin b/traces/st-g1-3.bin
deleted file mode 100644
index fa59c60..0000000
--- a/traces/st-g1-3.bin
+++ /dev/null
diff --git a/traces/st-g3-0.bin b/traces/st-g3-0.bin
deleted file mode 100644
index 37fdbb3..0000000
--- a/traces/st-g3-0.bin
+++ /dev/null
diff --git a/traces/st-g3-1.bin b/traces/st-g3-1.bin
deleted file mode 100644
index 583e1ec..0000000
--- a/traces/st-g3-1.bin
+++ /dev/null
diff --git a/traces/st-g3-2.bin b/traces/st-g3-2.bin
deleted file mode 100644
index d93c7ee..0000000
--- a/traces/st-g3-2.bin
+++ /dev/null
diff --git a/traces/st-g3-3.bin b/traces/st-g3-3.bin
deleted file mode 100644
index 21e0de7..0000000
--- a/traces/st-g3-3.bin
+++ /dev/null
diff --git a/traces/st-g4-0.bin b/traces/st-g4-0.bin
deleted file mode 100644
index c52ed7b..0000000
--- a/traces/st-g4-0.bin
+++ /dev/null
diff --git a/traces/st-g4-1.bin b/traces/st-g4-1.bin
deleted file mode 100644
index 77fea28..0000000
--- a/traces/st-g4-1.bin
+++ /dev/null
diff --git a/traces/st-g4-2.bin b/traces/st-g4-2.bin
deleted file mode 100644
index 4d5d3cd..0000000
--- a/traces/st-g4-2.bin
+++ /dev/null
diff --git a/traces/st-g4-3.bin b/traces/st-g4-3.bin
deleted file mode 100644
index 1cd7ee4..0000000
--- a/traces/st-g4-3.bin
+++ /dev/null
diff --git a/traces/st-g5-0.bin b/traces/st-g5-0.bin
deleted file mode 100644
index c576250..0000000
--- a/traces/st-g5-0.bin
+++ /dev/null
diff --git a/traces/st-g5-1.bin b/traces/st-g5-1.bin
deleted file mode 100644
index 90c4960..0000000
--- a/traces/st-g5-1.bin
+++ /dev/null
diff --git a/traces/st-g5-2.bin b/traces/st-g5-2.bin
deleted file mode 100644
index a06aa10..0000000
--- a/traces/st-g5-2.bin
+++ /dev/null
diff --git a/traces/st-g5-3.bin b/traces/st-g5-3.bin
deleted file mode 100644
index 561b776..0000000
--- a/traces/st-g5-3.bin
+++ /dev/null
diff --git a/traces/st-g6-0.bin b/traces/st-g6-0.bin
deleted file mode 100644
index cebc7fd..0000000
--- a/traces/st-g6-0.bin
+++ /dev/null
diff --git a/traces/st-g6-1.bin b/traces/st-g6-1.bin
deleted file mode 100644
index a51cce9..0000000
--- a/traces/st-g6-1.bin
+++ /dev/null
diff --git a/traces/st-g6-2.bin b/traces/st-g6-2.bin
deleted file mode 100644
index 5d76010..0000000
--- a/traces/st-g6-2.bin
+++ /dev/null
diff --git a/traces/st-g6-3.bin b/traces/st-g6-3.bin
deleted file mode 100644
index 471fc8d..0000000
--- a/traces/st-g6-3.bin
+++ /dev/null
diff --git a/traces/st-heavy-0.bin b/traces/st-heavy-0.bin
deleted file mode 100644
index 7a86776..0000000
--- a/traces/st-heavy-0.bin
+++ /dev/null
diff --git a/traces/st-heavy-1.bin b/traces/st-heavy-1.bin
deleted file mode 100644
index 9b8d976..0000000
--- a/traces/st-heavy-1.bin
+++ /dev/null
diff --git a/traces/st-heavy-2.bin b/traces/st-heavy-2.bin
deleted file mode 100644
index eb59023..0000000
--- a/traces/st-heavy-2.bin
+++ /dev/null
diff --git a/traces/st-heavy-3.bin b/traces/st-heavy-3.bin
deleted file mode 100644
index 06f73b5..0000000
--- a/traces/st-heavy-3.bin
+++ /dev/null
diff --git a/traces/st-heavy2-0.bin b/traces/st-heavy2-0.bin
deleted file mode 100644
index 4931d70..0000000
--- a/traces/st-heavy2-0.bin
+++ /dev/null
diff --git a/traces/st-heavy2-1.bin b/traces/st-heavy2-1.bin
deleted file mode 100644
index fbe14a0..0000000
--- a/traces/st-heavy2-1.bin
+++ /dev/null
diff --git a/traces/st-heavy2-2.bin b/traces/st-heavy2-2.bin
deleted file mode 100644
index d8edc0a..0000000
--- a/traces/st-heavy2-2.bin
+++ /dev/null
diff --git a/traces/st-heavy2-3.bin b/traces/st-heavy2-3.bin
deleted file mode 100644
index c173014..0000000
--- a/traces/st-heavy2-3.bin
+++ /dev/null
diff --git a/traces/st-heavy3-0.bin b/traces/st-heavy3-0.bin
deleted file mode 100644
index 4af21ed..0000000
--- a/traces/st-heavy3-0.bin
+++ /dev/null
diff --git a/traces/st-heavy3-1.bin b/traces/st-heavy3-1.bin
deleted file mode 100644
index b62ffac..0000000
--- a/traces/st-heavy3-1.bin
+++ /dev/null
diff --git a/traces/st-heavy3-2.bin b/traces/st-heavy3-2.bin
deleted file mode 100644
index 39a12e6..0000000
--- a/traces/st-heavy3-2.bin
+++ /dev/null
diff --git a/traces/st-heavy3-3.bin b/traces/st-heavy3-3.bin
deleted file mode 100644
index ae4a6a4..0000000
--- a/traces/st-heavy3-3.bin
+++ /dev/null
diff --git a/traces/st-mac-0.bin b/traces/st-mac-0.bin
deleted file mode 100644
index 7bac67d..0000000
--- a/traces/st-mac-0.bin
+++ /dev/null
diff --git a/traces/st-mac-1.bin b/traces/st-mac-1.bin
deleted file mode 100644
index a8a2f7e..0000000
--- a/traces/st-mac-1.bin
+++ /dev/null
diff --git a/traces/st-mac-test-0.bin b/traces/st-mac-test-0.bin
deleted file mode 100644
index 06e8403..0000000
--- a/traces/st-mac-test-0.bin
+++ /dev/null
diff --git a/traces/st-mac2-0.bin b/traces/st-mac2-0.bin
deleted file mode 100644
index 5afe202..0000000
--- a/traces/st-mac2-0.bin
+++ /dev/null
diff --git a/traces/st-s1-0.bin b/traces/st-s1-0.bin
deleted file mode 100644
index 5ad50f9..0000000
--- a/traces/st-s1-0.bin
+++ /dev/null
diff --git a/traces/st-s1-1.bin b/traces/st-s1-1.bin
deleted file mode 100644
index 7554c44..0000000
--- a/traces/st-s1-1.bin
+++ /dev/null
diff --git a/traces/st-s1-2.bin b/traces/st-s1-2.bin
deleted file mode 100644
index 047248c..0000000
--- a/traces/st-s1-2.bin
+++ /dev/null
diff --git a/traces/st-s1-3.bin b/traces/st-s1-3.bin
deleted file mode 100644
index 039e1a9..0000000
--- a/traces/st-s1-3.bin
+++ /dev/null
diff --git a/traces/st-s2-0.bin b/traces/st-s2-0.bin
deleted file mode 100644
index 639c561..0000000
--- a/traces/st-s2-0.bin
+++ /dev/null
diff --git a/traces/st-s2-1.bin b/traces/st-s2-1.bin
deleted file mode 100644
index 36f0254..0000000
--- a/traces/st-s2-1.bin
+++ /dev/null
diff --git a/traces/st-s2-2.bin b/traces/st-s2-2.bin
deleted file mode 100644
index 777c1f4..0000000
--- a/traces/st-s2-2.bin
+++ /dev/null
diff --git a/traces/st-s2-3.bin b/traces/st-s2-3.bin
deleted file mode 100644
index 917cb86..0000000
--- a/traces/st-s2-3.bin
+++ /dev/null
diff --git a/traces/st-x10-0.bin b/traces/st-x10-0.bin
deleted file mode 100644
index a372e75..0000000
--- a/traces/st-x10-0.bin
+++ /dev/null
diff --git a/traces/st-x10-1.bin b/traces/st-x10-1.bin
deleted file mode 100644
index bcf8d01..0000000
--- a/traces/st-x10-1.bin
+++ /dev/null
diff --git a/traces/st-x10-2.bin b/traces/st-x10-2.bin
deleted file mode 100644
index 3149ca8..0000000
--- a/traces/st-x10-2.bin
+++ /dev/null
diff --git a/traces/st-x10-3.bin b/traces/st-x10-3.bin
deleted file mode 100644
index cf899fd..0000000
--- a/traces/st-x10-3.bin
+++ /dev/null
diff --git a/traces/st-x11-0.bin b/traces/st-x11-0.bin
deleted file mode 100644
index 8404d49..0000000
--- a/traces/st-x11-0.bin
+++ /dev/null
diff --git a/traces/st-x11-1.bin b/traces/st-x11-1.bin
deleted file mode 100644
index 67e9063..0000000
--- a/traces/st-x11-1.bin
+++ /dev/null
diff --git a/traces/st-x11-2.bin b/traces/st-x11-2.bin
deleted file mode 100644
index a16c740..0000000
--- a/traces/st-x11-2.bin
+++ /dev/null
diff --git a/traces/st-x11-3.bin b/traces/st-x11-3.bin
deleted file mode 100644
index cbc4c54..0000000
--- a/traces/st-x11-3.bin
+++ /dev/null
diff --git a/traces/st-x12-0.bin b/traces/st-x12-0.bin
deleted file mode 100644
index 66a9995..0000000
--- a/traces/st-x12-0.bin
+++ /dev/null
diff --git a/traces/st-x12-1.bin b/traces/st-x12-1.bin
deleted file mode 100644
index 515f953..0000000
--- a/traces/st-x12-1.bin
+++ /dev/null
diff --git a/traces/st-x12-2.bin b/traces/st-x12-2.bin
deleted file mode 100644
index c21fce8..0000000
--- a/traces/st-x12-2.bin
+++ /dev/null
diff --git a/traces/st-x12-3.bin b/traces/st-x12-3.bin
deleted file mode 100644
index bc7be12..0000000
--- a/traces/st-x12-3.bin
+++ /dev/null
diff --git a/traces/st-x13-0.bin b/traces/st-x13-0.bin
deleted file mode 100644
index 023e917..0000000
--- a/traces/st-x13-0.bin
+++ /dev/null
diff --git a/traces/st-x13-1.bin b/traces/st-x13-1.bin
deleted file mode 100644
index 6072f16..0000000
--- a/traces/st-x13-1.bin
+++ /dev/null
diff --git a/traces/st-x13-2.bin b/traces/st-x13-2.bin
deleted file mode 100644
index c59a852..0000000
--- a/traces/st-x13-2.bin
+++ /dev/null
diff --git a/traces/st-x13-3.bin b/traces/st-x13-3.bin
deleted file mode 100644
index 295de3a..0000000
--- a/traces/st-x13-3.bin
+++ /dev/null
diff --git a/traces/st-x14-0.bin b/traces/st-x14-0.bin
deleted file mode 100644
index 19808b3..0000000
--- a/traces/st-x14-0.bin
+++ /dev/null
diff --git a/traces/st-x14-1.bin b/traces/st-x14-1.bin
deleted file mode 100644
index 34b3e63..0000000
--- a/traces/st-x14-1.bin
+++ /dev/null
diff --git a/traces/st-x14-2.bin b/traces/st-x14-2.bin
deleted file mode 100644
index 055851c..0000000
--- a/traces/st-x14-2.bin
+++ /dev/null
diff --git a/traces/st-x14-3.bin b/traces/st-x14-3.bin
deleted file mode 100644
index 9ade092..0000000
--- a/traces/st-x14-3.bin
+++ /dev/null
diff --git a/traces/st-x15-0.bin b/traces/st-x15-0.bin
deleted file mode 100644
index ce0b025..0000000
--- a/traces/st-x15-0.bin
+++ /dev/null
diff --git a/traces/st-x15-1.bin b/traces/st-x15-1.bin
deleted file mode 100644
index 1b2c23e..0000000
--- a/traces/st-x15-1.bin
+++ /dev/null
diff --git a/traces/st-x15-2.bin b/traces/st-x15-2.bin
deleted file mode 100644
index 9da74e5..0000000
--- a/traces/st-x15-2.bin
+++ /dev/null
diff --git a/traces/st-x15-3.bin b/traces/st-x15-3.bin
deleted file mode 100644
index 9645cd9..0000000
--- a/traces/st-x15-3.bin
+++ /dev/null
diff --git a/traces/st-x16-0.bin b/traces/st-x16-0.bin
deleted file mode 100644
index 175e14a..0000000
--- a/traces/st-x16-0.bin
+++ /dev/null
diff --git a/traces/st-x16-1.bin b/traces/st-x16-1.bin
deleted file mode 100644
index 73a1ae5..0000000
--- a/traces/st-x16-1.bin
+++ /dev/null
diff --git a/traces/st-x16-2.bin b/traces/st-x16-2.bin
deleted file mode 100644
index 8fcb27e..0000000
--- a/traces/st-x16-2.bin
+++ /dev/null
diff --git a/traces/st-x16-3.bin b/traces/st-x16-3.bin
deleted file mode 100644
index 6f1d246..0000000
--- a/traces/st-x16-3.bin
+++ /dev/null
diff --git a/traces/st-x17-0.bin b/traces/st-x17-0.bin
deleted file mode 100644
index c03c249..0000000
--- a/traces/st-x17-0.bin
+++ /dev/null
diff --git a/traces/st-x17-1.bin b/traces/st-x17-1.bin
deleted file mode 100644
index c0ea44d..0000000
--- a/traces/st-x17-1.bin
+++ /dev/null
diff --git a/traces/st-x17-2.bin b/traces/st-x17-2.bin
deleted file mode 100644
index 2da0356..0000000
--- a/traces/st-x17-2.bin
+++ /dev/null
diff --git a/traces/st-x17-3.bin b/traces/st-x17-3.bin
deleted file mode 100644
index 207d1a7..0000000
--- a/traces/st-x17-3.bin
+++ /dev/null
diff --git a/traces/st-x18-0.bin b/traces/st-x18-0.bin
deleted file mode 100644
index 2ed81f1..0000000
--- a/traces/st-x18-0.bin
+++ /dev/null
diff --git a/traces/st-x18-1.bin b/traces/st-x18-1.bin
deleted file mode 100644
index dd791c1..0000000
--- a/traces/st-x18-1.bin
+++ /dev/null
diff --git a/traces/st-x18-2.bin b/traces/st-x18-2.bin
deleted file mode 100644
index f90d9ab..0000000
--- a/traces/st-x18-2.bin
+++ /dev/null
diff --git a/traces/st-x18-3.bin b/traces/st-x18-3.bin
deleted file mode 100644
index 944156a..0000000
--- a/traces/st-x18-3.bin
+++ /dev/null
diff --git a/traces/st-x19-0.bin b/traces/st-x19-0.bin
deleted file mode 100644
index 1aeea29..0000000
--- a/traces/st-x19-0.bin
+++ /dev/null
diff --git a/traces/st-x19-1.bin b/traces/st-x19-1.bin
deleted file mode 100644
index 9e2129a..0000000
--- a/traces/st-x19-1.bin
+++ /dev/null
diff --git a/traces/st-x19-2.bin b/traces/st-x19-2.bin
deleted file mode 100644
index e9cd71b..0000000
--- a/traces/st-x19-2.bin
+++ /dev/null
diff --git a/traces/st-x19-3.bin b/traces/st-x19-3.bin
deleted file mode 100644
index 530523d..0000000
--- a/traces/st-x19-3.bin
+++ /dev/null
diff --git a/traces/st-x2-0.bin b/traces/st-x2-0.bin
deleted file mode 100644
index e24dcab..0000000
--- a/traces/st-x2-0.bin
+++ /dev/null
diff --git a/traces/st-x2-1.bin b/traces/st-x2-1.bin
deleted file mode 100644
index 4a66180..0000000
--- a/traces/st-x2-1.bin
+++ /dev/null
diff --git a/traces/st-x2-2.bin b/traces/st-x2-2.bin
deleted file mode 100644
index 76cde24..0000000
--- a/traces/st-x2-2.bin
+++ /dev/null
diff --git a/traces/st-x2-3.bin b/traces/st-x2-3.bin
deleted file mode 100644
index faa0b90..0000000
--- a/traces/st-x2-3.bin
+++ /dev/null
diff --git a/traces/st-x3-0.bin b/traces/st-x3-0.bin
deleted file mode 100644
index 60107c7..0000000
--- a/traces/st-x3-0.bin
+++ /dev/null
diff --git a/traces/st-x3-1.bin b/traces/st-x3-1.bin
deleted file mode 100644
index 7a5fe39..0000000
--- a/traces/st-x3-1.bin
+++ /dev/null
diff --git a/traces/st-x3-2.bin b/traces/st-x3-2.bin
deleted file mode 100644
index 1d40df6..0000000
--- a/traces/st-x3-2.bin
+++ /dev/null
diff --git a/traces/st-x3-3.bin b/traces/st-x3-3.bin
deleted file mode 100644
index afba2e1..0000000
--- a/traces/st-x3-3.bin
+++ /dev/null
diff --git a/traces/st-x4-0.bin b/traces/st-x4-0.bin
deleted file mode 100644
index 260bec7..0000000
--- a/traces/st-x4-0.bin
+++ /dev/null
diff --git a/traces/st-x4-1.bin b/traces/st-x4-1.bin
deleted file mode 100644
index 17669ae..0000000
--- a/traces/st-x4-1.bin
+++ /dev/null
diff --git a/traces/st-x4-2.bin b/traces/st-x4-2.bin
deleted file mode 100644
index a02713f..0000000
--- a/traces/st-x4-2.bin
+++ /dev/null
diff --git a/traces/st-x4-3.bin b/traces/st-x4-3.bin
deleted file mode 100644
index db5e880..0000000
--- a/traces/st-x4-3.bin
+++ /dev/null
diff --git a/traces/st-x5-0.bin b/traces/st-x5-0.bin
deleted file mode 100644
index 6fb2ac3..0000000
--- a/traces/st-x5-0.bin
+++ /dev/null
diff --git a/traces/st-x5-1.bin b/traces/st-x5-1.bin
deleted file mode 100644
index 6466f25..0000000
--- a/traces/st-x5-1.bin
+++ /dev/null
diff --git a/traces/st-x5-2.bin b/traces/st-x5-2.bin
deleted file mode 100644
index 93915e9..0000000
--- a/traces/st-x5-2.bin
+++ /dev/null
diff --git a/traces/st-x5-3.bin b/traces/st-x5-3.bin
deleted file mode 100644
index 69fb611..0000000
--- a/traces/st-x5-3.bin
+++ /dev/null
diff --git a/traces/st-x6-0.bin b/traces/st-x6-0.bin
deleted file mode 100644
index ed18dae..0000000
--- a/traces/st-x6-0.bin
+++ /dev/null
diff --git a/traces/st-x6-1.bin b/traces/st-x6-1.bin
deleted file mode 100644
index 4689df1..0000000
--- a/traces/st-x6-1.bin
+++ /dev/null
diff --git a/traces/st-x6-2.bin b/traces/st-x6-2.bin
deleted file mode 100644
index 0977d93..0000000
--- a/traces/st-x6-2.bin
+++ /dev/null
diff --git a/traces/st-x6-3.bin b/traces/st-x6-3.bin
deleted file mode 100644
index 3b2cdc9..0000000
--- a/traces/st-x6-3.bin
+++ /dev/null
diff --git a/traces/st-x7-0.bin b/traces/st-x7-0.bin
deleted file mode 100644
index 2d11122..0000000
--- a/traces/st-x7-0.bin
+++ /dev/null
diff --git a/traces/st-x7-1.bin b/traces/st-x7-1.bin
deleted file mode 100644
index 4e13060..0000000
--- a/traces/st-x7-1.bin
+++ /dev/null
diff --git a/traces/st-x7-2.bin b/traces/st-x7-2.bin
deleted file mode 100644
index 07768b8..0000000
--- a/traces/st-x7-2.bin
+++ /dev/null
diff --git a/traces/st-x7-3.bin b/traces/st-x7-3.bin
deleted file mode 100644
index b3e71da..0000000
--- a/traces/st-x7-3.bin
+++ /dev/null
diff --git a/traces/st-x9-0.bin b/traces/st-x9-0.bin
deleted file mode 100644
index be09f48..0000000
--- a/traces/st-x9-0.bin
+++ /dev/null
diff --git a/traces/st-x9-1.bin b/traces/st-x9-1.bin
deleted file mode 100644
index 19b14e8..0000000
--- a/traces/st-x9-1.bin
+++ /dev/null
diff --git a/traces/st-x9-2.bin b/traces/st-x9-2.bin
deleted file mode 100644
index dcbb59c..0000000
--- a/traces/st-x9-2.bin
+++ /dev/null
diff --git a/traces/st-x9-3.bin b/traces/st-x9-3.bin
deleted file mode 100644
index 1aea9a2..0000000
--- a/traces/st-x9-3.bin
+++ /dev/null
diff --git a/traces/st-xxx-0.bin b/traces/st-xxx-0.bin
deleted file mode 100644
index 1b661a5..0000000
--- a/traces/st-xxx-0.bin
+++ /dev/null
diff --git a/traces/st-xxx-1.bin b/traces/st-xxx-1.bin
deleted file mode 100644
index d82d027..0000000
--- a/traces/st-xxx-1.bin
+++ /dev/null
diff --git a/traces/st-xxx-2.bin b/traces/st-xxx-2.bin
deleted file mode 100644
index d3586e9..0000000
--- a/traces/st-xxx-2.bin
+++ /dev/null
diff --git a/traces/st-xxx-3.bin b/traces/st-xxx-3.bin
deleted file mode 100644
index 5d9168c..0000000
--- a/traces/st-xxx-3.bin
+++ /dev/null
diff --git a/traces/st0.fg b/traces/st0.fg
deleted file mode 100644
index 4008086..0000000
--- a/traces/st0.fg
+++ /dev/null
diff --git a/traces/st1.fg b/traces/st1.fg
deleted file mode 100644
index 5d5c5ae..0000000
--- a/traces/st1.fg
+++ /dev/null
diff --git a/traces/stg20.bin b/traces/stg20.bin
deleted file mode 100644
index a12ca3e..0000000
--- a/traces/stg20.bin
+++ /dev/null
diff --git a/traces/stg21.bin b/traces/stg21.bin
deleted file mode 100644
index b0ab240..0000000
--- a/traces/stg21.bin
+++ /dev/null
diff --git a/traces/stg22.bin b/traces/stg22.bin
deleted file mode 100644
index 1d1a0a5..0000000
--- a/traces/stg22.bin
+++ /dev/null
diff --git a/traces/stg23.bin b/traces/stg23.bin
deleted file mode 100644
index fed856f..0000000
--- a/traces/stg23.bin
+++ /dev/null
diff --git a/traces/test.pdf b/traces/test.pdf
deleted file mode 100644
index e0c2850..0000000
--- a/traces/test.pdf
+++ /dev/null
diff --git a/traces/x11.pdf b/traces/x11.pdf
deleted file mode 100644
index 6c909a9..0000000
--- a/traces/x11.pdf
+++ /dev/null
diff --git a/traces/x12.pdf b/traces/x12.pdf
deleted file mode 100644
index 0d16db3..0000000
--- a/traces/x12.pdf
+++ /dev/null
diff --git a/traces/x13.pdf b/traces/x13.pdf
deleted file mode 100644
index fb527ce..0000000
--- a/traces/x13.pdf
+++ /dev/null
diff --git a/traces/x14.pdf b/traces/x14.pdf
deleted file mode 100644
index f22df22..0000000
--- a/traces/x14.pdf
+++ /dev/null
diff --git a/traces/x15.pdf b/traces/x15.pdf
deleted file mode 100644
index a2da624..0000000
--- a/traces/x15.pdf
+++ /dev/null
diff --git a/traces/x16.pdf b/traces/x16.pdf
deleted file mode 100644
index bc19a32..0000000
--- a/traces/x16.pdf
+++ /dev/null
diff --git a/traces/x17.pdf b/traces/x17.pdf
deleted file mode 100644
index b74b90f..0000000
--- a/traces/x17.pdf
+++ /dev/null
diff --git a/traces/x18.pdf b/traces/x18.pdf
deleted file mode 100644
index 6d8feb0..0000000
--- a/traces/x18.pdf
+++ /dev/null
diff --git a/traces/x19.pdf b/traces/x19.pdf
deleted file mode 100644
index 60c0af0..0000000
--- a/traces/x19.pdf
+++ /dev/null
diff --git a/visualizer.py b/visualizer.py
index 80c2af9..c15bf51 100755
--- a/visualizer.py
+++ b/visualizer.py
@@ -1,31 +1,11 @@
 #!/usr/bin/python
-
-"""Runs the visualizer."""
-
-import convert
-import reader
-import viz
-
 import gtk
+import viz
 
-path = 'sample_traces/'
-
-trace_list = [
-path + 'st-g6-0.bin',
-path + 'st-g6-1.bin',
-path + 'st-g6-2.bin',
-path + 'st-g6-3.bin'
-]
-        
-if __name__ == '__main__':
-    stream = reader.trace_reader.trace_reader(trace_list)
-    stream = reader.sanitizer.sanitizer(stream)
-    stream = reader.gedf_test.gedf_test(stream)
-    sched = convert.convert_trace_to_schedule(stream)
+def visualizer(stream):
+    sched = viz.convert.convert_trace_to_schedule(stream)
     sched.scan(10000000)
     renderer = viz.renderer.Renderer(sched)
     renderer.prepare_task_graph(attrs=viz.format.GraphFormat(time_per_maj=10000000))
-        
     viz.viewer.MainWindow(renderer)
     gtk.main()
-    
diff --git a/viz/__init__.py b/viz/__init__.py
index ef409f6..5f8d000 100644
--- a/viz/__init__.py
+++ b/viz/__init__.py
@@ -3,6 +3,7 @@ import renderer
 import format
 import gobject
 import gtk
+import convert
 
 gobject.signal_new('set-scroll-adjustments', viewer.GraphArea, gobject.SIGNAL_RUN_FIRST,
                        None, (gtk.Adjustment, gtk.Adjustment))
diff --git a/convert.py b/viz/convert.py
index 1db4ad0..deb50c8 100644
--- a/convert.py
+++ b/viz/convert.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-from viz.schedule import *
-from reader.trace_reader import *
+from schedule import *
+from trace_reader import *
 
 """Class that interprets the raw trace data, outputting it
 to a Python schedule object.
diff --git a/reader/trace_reader.py b/viz/trace_reader.py
index a4ff964..a4ff964 100644
--- a/reader/trace_reader.py
+++ b/viz/trace_reader.py