Code movement / completion

Move interfaces to the correct file and merged them with local
repository