updated file structure, further simplification of app and effects