Refractoring interfaces & Jakefile