Moved \api\java\... to \main\...\api\