moved imports to hide priveate files, removed NSLog statements, changed to build for all architectures