Re-structure and add missing files