Add package structure in classes