Fps independence
Refactor
More refactoring
Restructuring