resolving #3 while moving to xcode 6.1b2

resolving duplicate filenames and factor methods