Fixed folder name to package name