Improved directory structure.
Added second effect