Cleaned up the order of the import statements.
Removed unnecessary stand alone scripts that are now contained in the
Data class.