Changed directory structure. Incoorporated TWL