Changing to AStudio structure, package name changes, project name changes, minor string changes