StreamExecutionEnvironment restructure to match main project