Switching to maven based build