Updated license and moved stuff around