Removed categories and view controllers in order to simplify project scope and dependencies
Further cleaned up dependencies