Package and mediaplayer refactoring
Fixed some bugs