added AFNetworking and restructured some classes
deleted recursive directory
fixed merge problems