Working
Directory Stcructure issues fixec