Changed package structure and app name