Issue/#350

fixes #350 
Updated folder structure too