Refactored folder structure to add feature_jobs