Files refactored and cleaned up.