Fix license and moved classes