cleanup etc, basic support for maven