Revised directory / package structure.