Changed packages to reflect manage.py location change (See submodule commit for details/files)