restructure files structure and add namespace