REFACTOR: Created appropriate packages