Refactor to Maven structure