updated main to handle changed folder/package name