More interfaces + solution rename