Cleaned-up code. Deleted almost all classes outside the sim package.