Put Employee and Manager in proper packages