NOOP: Cleaned up package layout