Introduced Maven and some general cleanup