Restructuring: added missing files