Changing to Maven structure