Files cleaned

Removed indirect file access
Core inter file dependency removed