Moved files to nicer places
Moved delegates and commented them
Added information