renamed Project07-Core components