Removed renamed and moved classes