Package layout is now conventions compliant