Updated core files structure