Cleaned up the source tree + working mesos task