Refactored files in to two new packages configs and strategies