Interfaces moved to their dir