AC-FOVE: Code Refactoring

Checkpoint before changes in code structure.