Updates x3

1. Minor changes to the architecture
2. Refined two classes in package Resource
3. Renamed two diagrams