Restuctured folders to remove the excessive nesting