Some changes to effects implementation
Folder restructurezation