Added test and module structure.