Moved into sub packages
Added Fps counter