Add / Move classes and interfaces