Restructuring, addition of interfaces for connections, pom-warnings fixed