Move libs to package structure