More comments and restructured the source/package tree