Refactored to include models subdir