Remove excess files (where did they come from?)
Add mapper files and block (experimental)
Add events to init
Remove old resource files