Bound methods to instance
Move files around to make application flatter
Fix scope in callback
Resolved conflicts