moved framework code in extra project