Refactored package names and changed fps to 60