Fixed idents and moved require to package instantation