Comments/changes for singular/required tags

Added base and main and their db messages, restructured and added
overlooking javadoc comments. Put some apparently unneeded files into a
separate folder.