Changes made in align with Core Files Rework

Signed-off-by: EviiL <eviildesigns@gmail.com>