Project package refactor