Major overhaul

Making framework fit for composer