Adding maven and moving things around