Properly restructured project directory with packages.