Added focus token model
Moved stuff into subdirs
Merge remote-tracking branch 'origin/master'