Fixed the reference part
Started renaming the system files