Re-factor to Communication project