Renamed package name in sourcefiles because of directory structure
refactoring.