Revert c04b0a1..c2b5a2e

This rolls back to commit c04b0a1449ba4d759c57007f8dd21b6d60168b96.
Reorganize and retrieve the missed files