Removed duplicates of class files that somehow snuck in there thanks to xcode and my lack of coffee this morning.