Name changes, and moved classes
Added one todo