Moved files
Rename and reformat
Big cleanup
More guice
Extracted fps measurement