Created infrastructure classes, updated pom